﻿<!DOCTYPE html>
<html lang="en">
<head>
    <meta charset="UTF-8">
    <meta name="viewport" content="width=device-width, initial-scale=1.0">
    <title>Document</title>
</head>
<body>
    <div id='app'>
        git代码冲突
        1111
        2222
    </div>
    <script src='./vue.js'></script>
    <script>
    new Vue({
    el:'#app',
    data:{}
    })
    </script>
</body>
</html>